bitkeeper revision 1.1159.1.431 (419b8f9eB2e8NRN4lMyyV1Pqx5h9Aw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 17 Nov 2004 17:51:26 +0000 (17:51 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 17 Nov 2004 17:51:26 +0000 (17:51 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp


Trivial merge